merge with xen-ia64-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Fri, 15 Dec 2006 18:32:58 +0000 (11:32 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Fri, 15 Dec 2006 18:32:58 +0000 (11:32 -0700)

Trivial merge